Auto merge of #1754 - tshepang:patch-1, r=steveklabnik
authorbors <bors@rust-lang.org>
Fri, 26 Jun 2015 18:32:35 +0000 (18:32 +0000)
committerbors <bors@rust-lang.org>
Fri, 26 Jun 2015 18:32:35 +0000 (18:32 +0000)

Trivial merge